Fix base image pinning during upgrades via cluster/gce/upgrade.sh #33147

vishh · 2016-09-21T01:32:04Z

Fix base image pinning during upgrades via cluster/gce/upgrade.sh

This change is

Signed-off-by: Vishnu kannan <vishnuk@google.com>

vishh · 2016-09-21T01:43:39Z

cc @Amey-D

timstclair · 2016-09-23T21:32:19Z

I'm struggling to trace this code. Can you summarize what the issue was, and how this fixes it?

vishh · 2016-09-23T21:43:09Z

This PR ensures that we set the KUBE_NODE_OS_DISTRIBUTION env variable
early enough for the rest of the upgrade logic to setup the env variables
for the upgrade appropriately.
This PR still doesn't fix gci -> gci upgrades fully. I will appreciate any
help in fixing that upgrade path completely.

On Fri, Sep 23, 2016 at 2:33 PM, Tim St. Clair notifications@github.com
wrote:

I'm struggling to trace this code. Can you summarize what the issue was,
and how this fixes it?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#33147 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AGvIKGWEXLyp-zjcwL-ZClDRWWg4E1dGks5qtEWVgaJpZM4KCT8T
.

timstclair · 2016-09-23T21:46:40Z

Got it. LGTM.

k8s-ci-robot · 2016-09-23T22:59:13Z

Jenkins GCI GKE smoke e2e failed for commit 8f7b274. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

mtaufen · 2016-10-04T20:29:43Z

Jenkins GCI GKE smoke e2e failed with this near the end of the log:

ERROR: (gcloud.container.clusters.create) Operation [<Operation
 name: u'operation-1474670221656-ee661d04'
 operationType: OperationTypeValueValuesEnum(CREATE_CLUSTER, 1)
 selfLink: u'https://test-container.sandbox.googleapis.com/v1/projects/943316867058/zones/us-central1-f/operations/operation-1474670221656-ee661d04'
 status: StatusValueValuesEnum(DONE, 3)
 statusMessage: u'Timed out waiting for cluster initialization. Cluster API may not be available.'
 targetLink: u'https://test-container.sandbox.googleapis.com/v1/projects/943316867058/zones/us-central1-f/clusters/e2e-gke-agent-pr-66-0'
 zone: u'us-central1-f'>] finished with error: Timed out waiting for cluster initialization. Cluster API may not be available.

mtaufen · 2016-10-04T20:31:28Z

@k8s-bot gci gke test this issue #IGNORE

k8s-github-robot · 2016-10-05T07:43:43Z

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2016-10-05T08:19:55Z

Automatic merge from submit-queue

The original fix (kubernetes#33147) sourced the correct `node-helper.sh` but set `node_os_distribution` instead of `NODE_OS_DISTRIBUTION`. The `set-node-image` function is imported indirectly via `source "${KUBE_ROOT}/cluster/kube-util.sh"`, which in turn (in the GCE case) sources `cluster/gce/util.sh`. Since the `set-node-image` function relies on the `NODE_OS_DISTRIBUTION` variable, the original fix did not have the entire intended effect. I have confirmed that cherry-picking kubernetes#33147 into the `release-1.4` branch and layering this commit on top of it make for a successful upgrade from a GCI based K8s 1.3 cluster to a GCI based K8s 1.4 cluster.

Automatic merge from submit-queue Fix upgrade.sh image setup The original fix (#33147) sourced the correct `node-helper.sh` but set `node_os_distribution` instead of `NODE_OS_DISTRIBUTION`. The `set-node-image` function is imported indirectly via `source "${KUBE_ROOT}/cluster/kube-util.sh"`, which in turn (in the GCE case) sources `cluster/gce/util.sh`. Since the `set-node-image` function relies on the `NODE_OS_DISTRIBUTION` variable, the original fix did not have the entire intended effect. I have confirmed that cherry-picking #33147 into the `release-1.4` branch and layering this commit on top of it make for a successful upgrade from a GCI based K8s 1.3 cluster to a GCI based K8s 1.4 cluster. **NOTE:** This, along with #33147, should be cherry-picked into the `release-1.4` branch.

k8s-cherrypick-bot · 2016-10-11T16:44:23Z

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

mtaufen · 2016-10-11T16:48:48Z

@jessfraz This fix should be cherrypicked into 1.4.

The original fix (kubernetes#33147) sourced the correct `node-helper.sh` but set `node_os_distribution` instead of `NODE_OS_DISTRIBUTION`. The `set-node-image` function is imported indirectly via `source "${KUBE_ROOT}/cluster/kube-util.sh"`, which in turn (in the GCE case) sources `cluster/gce/util.sh`. Since the `set-node-image` function relies on the `NODE_OS_DISTRIBUTION` variable, the original fix did not have the entire intended effect. I have confirmed that cherry-picking kubernetes#33147 into the `release-1.4` branch and layering this commit on top of it make for a successful upgrade from a GCI based K8s 1.3 cluster to a GCI based K8s 1.4 cluster.

#34468-#34416-#34010-origin-release-1.4 Automatic merge from submit-queue Automated cherry pick of #33147 #34468 #34416 #34010 origin release 1.4 Cherry pick of #33147 #34468 #34416 #34010 on release-1.4. #33147: fix base image pinning during upgrades via #34468: Fix upgrade.sh image setup #34416: hyperkube image: add cifs-utils #34010: Match GroupVersionKind against specific version

jessfraz · 2016-10-13T21:26:35Z

cherry-picked from #34628

The original fix (kubernetes#33147) sourced the correct `node-helper.sh` but set `node_os_distribution` instead of `NODE_OS_DISTRIBUTION`. The `set-node-image` function is imported indirectly via `source "${KUBE_ROOT}/cluster/kube-util.sh"`, which in turn (in the GCE case) sources `cluster/gce/util.sh`. Since the `set-node-image` function relies on the `NODE_OS_DISTRIBUTION` variable, the original fix did not have the entire intended effect. I have confirmed that cherry-picking kubernetes#33147 into the `release-1.4` branch and layering this commit on top of it make for a successful upgrade from a GCI based K8s 1.3 cluster to a GCI based K8s 1.4 cluster.

…ck-of-#33147-kubernetes#34468-kubernetes#34416-kubernetes#34010-origin-release-1.4 Automatic merge from submit-queue Automated cherry pick of kubernetes#33147 kubernetes#34468 kubernetes#34416 kubernetes#34010 origin release 1.4 Cherry pick of kubernetes#33147 kubernetes#34468 kubernetes#34416 kubernetes#34010 on release-1.4. kubernetes#33147: fix base image pinning during upgrades via kubernetes#34468: Fix upgrade.sh image setup kubernetes#34416: hyperkube image: add cifs-utils kubernetes#34010: Match GroupVersionKind against specific version

fix base image pinning during upgrades via cluster/gce/upgrade.sh

8f7b274

Signed-off-by: Vishnu kannan <vishnuk@google.com>

googlebot added the cla: yes label Sep 21, 2016

k8s-github-robot assigned eparis Sep 21, 2016

k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Sep 21, 2016

vishh assigned timstclair and unassigned eparis Sep 23, 2016

vishh added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Sep 23, 2016

vishh closed this Sep 23, 2016

vishh reopened this Sep 23, 2016

mtaufen added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Oct 4, 2016

k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Oct 4, 2016

mtaufen added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Oct 4, 2016

k8s-github-robot removed the release-note-label-needed label Oct 4, 2016

k8s-github-robot merged commit cccd3b3 into kubernetes:master Oct 5, 2016

mtaufen mentioned this pull request Oct 10, 2016

Fix upgrade.sh image setup #34468

Merged

mtaufen added the cherrypick-candidate label Oct 11, 2016

k8s-cherrypick-bot removed the cherrypick-candidate label Oct 11, 2016

mtaufen added this to the v1.4 milestone Oct 11, 2016

mtaufen added the cherrypick-candidate label Oct 11, 2016

jessfraz mentioned this pull request Oct 12, 2016

Automated cherry pick of #33147 #34468 #34416 #34010 origin release 1.4 #34628

Merged

jessfraz removed the cherrypick-candidate label Oct 13, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix base image pinning during upgrades via cluster/gce/upgrade.sh #33147

Fix base image pinning during upgrades via cluster/gce/upgrade.sh #33147

vishh commented Sep 21, 2016 •

edited by jessfraz

vishh commented Sep 21, 2016

timstclair commented Sep 23, 2016

vishh commented Sep 23, 2016

timstclair commented Sep 23, 2016

k8s-ci-robot commented Sep 23, 2016

mtaufen commented Oct 4, 2016

mtaufen commented Oct 4, 2016

k8s-github-robot commented Oct 5, 2016

k8s-github-robot commented Oct 5, 2016

k8s-cherrypick-bot commented Oct 11, 2016

mtaufen commented Oct 11, 2016

jessfraz commented Oct 13, 2016

Fix base image pinning during upgrades via cluster/gce/upgrade.sh #33147

Fix base image pinning during upgrades via cluster/gce/upgrade.sh #33147

Conversation

vishh commented Sep 21, 2016 • edited by jessfraz

vishh commented Sep 21, 2016

timstclair commented Sep 23, 2016

vishh commented Sep 23, 2016

timstclair commented Sep 23, 2016

k8s-ci-robot commented Sep 23, 2016

mtaufen commented Oct 4, 2016

mtaufen commented Oct 4, 2016

k8s-github-robot commented Oct 5, 2016

k8s-github-robot commented Oct 5, 2016

k8s-cherrypick-bot commented Oct 11, 2016

mtaufen commented Oct 11, 2016

jessfraz commented Oct 13, 2016

vishh commented Sep 21, 2016 •

edited by jessfraz